several fixes, magic words and semantic queries for buttons