#288 changes to the backend using the criteria API