added link context support
minor cleanup
better query preprocessing
updating version