Refactor category saving
Issue #170: Force Close when switching views with Genre category

A force close would occur when the Genre was selected and subcategory was
not being saved or passed.  Also the code was not taking into account the
secondary level to make sure the secondary category would be refreshed.