progress on shop query and shop panel