Fixed search arguments sometimes being messed-up when parsed (depending on the order they were processed).