Refactored full image query and replaced notifications with blocks