Misc Update
Optimize Query Speed