Added Json properties and date criteria on finder queries