Fix wildcard search and optimise local delivery + pickup Closes #6676