Added ablity to query by library.