Added new Search Tag option for searching in Lookup Table
Changed some code