improved ProfileQueries