Improved query interface and added batch route