Added identifier query - implementation and tests