Enhanced readability of queries