added query capability to find entity
completed field implementation