Major score improvements (tested only for adobe query)