Rewrote query system so it searches for identifiers