Update: add query JOIN Statement and edit Order By