Actually filter results by keyword. Also improve create-data script.