Add Kind filter specs & clean up HAML.