Changed to use Ebean query instead of finder