But I like buttons. The more, the better. Complexity is more a function of depth than breadth.
I don't trust your integrated search feature to understand what I want, and in any event, I rarely feel like playing a game of Zork to get my work done.
Please use buttons, clearly labeled in English (if not the user's native language.)
Looking at your screenshots, you pretty much had it right the first time.