changed one condition necessary to make where-questions work (tested succesfully)