Removed ALL criterion,added test and code to select all when criteria is empty