Advanced queries support added