Fixed type ahead issue
Merge pull request #3258 from nicolaasmatthijs/typeAhead

Fixed type ahead issue