Filtering for books, fixes DEVELOPER-468

Yeah, there is a little cleanup I'll do once the functionality is down pat