Squashed commit of the following:

commit f9d129b3f6b7a31a54cfdf5d3ea085b37d14cb82
Author: Giel Berkers <giel@twisted.nl>
Date:   Wed Oct 24 17:24:16 2012 +0200

    Added a small check to see if a specific type of field is installed

commit dac9899c5a96075d37a274a7908c7f8bbb3e7f0d
Author: Giel Berkers <giel@twisted.nl>
Date:   Wed Oct 24 17:15:28 2012 +0200

    Fixes selecting of correct fields

commit d4521979fde4db08b80f88387fbc427710aac4b9
Author: Giel Berkers <giel@twisted.nl>
Date:   Wed Oct 24 17:11:14 2012 +0200

    Made some small hotfixes for compatibility with S2.3

commit 47b3ec8dcaa68829401a6ce7747efc6e716fdcd4
Author: Brendan Abbott <brendan@bloodbone.ws>
Date:   Tue Mar 27 22:59:39 2012 +1000

    Initial updates for Symphony 2.3