Pull in fix for missing import in queue
Skip search index update for router

And stop saving the entire model when only flags have changed