improved farmview handling