Fixes for dop down list
Merge pull request #512 from nla/ti_search_fixes

Fixes for dop down list, merged.
Merge remote-tracking branch 'origin/master' into dsc-305