Allow user to add question to search fields
Merge branch 'MH-591' into dev