added query and fade