More progress on TabCompleteBahavior