Add query, sort props