Fixed query of FirstOrDefault() returning null from client side resource.
Merge branch 'development' of https://github.com/okb/Pomona into development