fix bug with ()
some serious refactor. entityName has to consist object from now