Added category selection and minor improvement for keywords