Fixing the Admin Lib's up and converting the query's