Improve ag completion script