Properly handle token new error
merging in dan patch

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
latest styling complete