Improved keywords
added genre filtering