Optimize queries
Optimize query, remove accept header