Fixes for event query to use id, validation for estimate