Disabled leading wildcard searches including '*' and '?'. Added validati...

...on for 'type'