Improved features, added Custom Query Capability