fix for other types of queries