added Comparator to export
added rappid query object