Resolve for saving entities and parse for queries

custom parser should use ids not entities
fixes #10