Add surrounding space in default value assignment
Allow search query to be passed in options hash