Fixed UUID-based entry lookup so that it will use normal orm queries
instaed of custom dicts