cleanup autoload path additions

http://pm.tablexi.com/issues/80421
cleanup query syntax

http://pm.tablexi.com/issues/80421