FIX: Fix for selecting boolean field