Refactored saved User Query fields