upd entity, routes fixes