Corrected some pictures not shown in their position
Query sub classes format change