FAIMS-311: fixing bug with follow tool using database or spatialite layers
merging master