fixed queries
fixed indivi
using local version of vis
resolve merge conflict