Added serveral new features when searching by query