fixed selector logic

- bad flow needs good refactoring.
fixed some of the redirection logic.
Merge branch 'handlebars-conversion' of github.com:d4gg4d/nakkikone into handlebars-conversion