Fix COA listing and adding an issue on Android 3+