Slightly more kosher selection handling fixes #18