#3494

Updated the code to support searches for multi word tag.

Please check.