Working on library queries