query: removed custom queries support